diff --git a/flake.nix b/flake.nix
index ae326ac..94e4eae 100644
--- a/flake.nix
+++ b/flake.nix
@@ -49,22 +49,23 @@
         inherit inputs stable-pkgs;
       };
 
+      # Common modules applied to EVERY host
+      baseModules = [
+        home-manager.nixosModules.home-manager
+        {
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
+          home-manager.users.phoenix = import ./home/phoenix.nix;
+          home-manager.extraSpecialArgs = baseSpecialArgs;
+        }
+        ./modules/common
+      ];
+
       mkHost = hostName: hostModules:
         lib.nixosSystem {
           inherit system;
           specialArgs = baseSpecialArgs;
-          modules =
-            [
-              home-manager.nixosModules.home-manager
-              {
-                home-manager.useGlobalPkgs = true;
-                home-manager.useUserPackages = true;
-                home-manager.users.phoenix = import ./home/phoenix.nix;
-                home-manager.extraSpecialArgs = baseSpecialArgs;
-              }
-              ./modules/common
-            ]
-            ++ hostModules;
+          modules = baseModules ++ hostModules;
         };
 
       treefmtEval = treefmt-nix.lib.evalModule pkgs {
@@ -98,7 +99,7 @@
             keys.phoenix.keyFile = "/home/nixos/.ssh/id_ed25519.pub";
             tags = [ "homelab" ];
           };
-          imports = [ ./hosts/blade ];
+          imports = baseModules ++ [ ./hosts/blade ];
         };
       };