diff --git a/flake/hosts.nix b/flake/hosts.nix
index 00538f2..935943b 100644
--- a/flake/hosts.nix
+++ b/flake/hosts.nix
@@ -10,6 +10,12 @@ let
       specialArgs = { inherit inputs self; };
       modules =
         let
+          hostFiles =
+            "${self}/hosts/${hostName}"
+            |> builtins.readDir
+            |> lib.filterAttrs (fileName: type: (fileName |> lib.hasSuffix ".nix") && type == "regular")
+            |> builtins.attrNames
+            |> map (fileName: "${self}/hosts/${hostName}/${fileName}");
           userFiles =
             "${self}/users"
             |> builtins.readDir
@@ -20,7 +26,8 @@ let
         in
         lib.flatten [
           { networking = { inherit hostName; }; }
-          "${self}/hosts/${hostName}"
+          "${self}/hosts/shared.nix"
+          hostFiles
           userFiles
         ];
     };
diff --git a/hosts/alto/default.nix b/hosts/alto/default.nix
index 17a8126..d210fcb 100644
--- a/hosts/alto/default.nix
+++ b/hosts/alto/default.nix
@@ -1,10 +1,4 @@
 {
-  imports = [
-    ../shared.nix
-    ./hardware.nix
-    ./disko.nix
-  ];
-
   system.stateVersion = "24.11";
 
   myConfig = {
diff --git a/hosts/fern/default.nix b/hosts/fern/default.nix
index efd9b32..76537bb 100644
--- a/hosts/fern/default.nix
+++ b/hosts/fern/default.nix
@@ -1,11 +1,5 @@
 { pkgs, ... }:
 {
-  imports = [
-    ../shared.nix
-    ./hardware.nix
-    ./disko.nix
-  ];
-
   system.stateVersion = "24.11";
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
diff --git a/hosts/north/default.nix b/hosts/north/default.nix
index 40fb504..9e48d1c 100644
--- a/hosts/north/default.nix
+++ b/hosts/north/default.nix
@@ -1,11 +1,5 @@
 { pkgs, ... }:
 {
-  imports = [
-    ../shared.nix
-    ./hardware.nix
-    ./disko.nix
-  ];
-
   system.stateVersion = "23.11";
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
diff --git a/hosts/stratus/default.nix b/hosts/stratus/default.nix
index c11c71c..e9d6cfa 100644
--- a/hosts/stratus/default.nix
+++ b/hosts/stratus/default.nix
@@ -1,9 +1,5 @@
 {
   imports = [
-    ../shared.nix
-    ./hardware.nix
-    ./disko.nix
-
     ./containers/docker
     ./containers/nspawn
   ];