diff --git a/modules/nixos-configurations.nix b/modules/nixos-configurations.nix
index 7d091988..8c764d9b 100644
--- a/modules/nixos-configurations.nix
+++ b/modules/nixos-configurations.nix
@@ -17,7 +17,7 @@
         username = "opdavies";
       };
 
-      mkNixosConfiguration =
+      mkHost =
         {
           hostname,
           modules ? [ ],
@@ -27,9 +27,18 @@
         inputs.nixpkgs.lib.nixosSystem {
           inherit system;
 
-          modules = modules ++ [
-            "${self}/hosts/${hostname}/configuration.nix"
-          ];
+          modules =
+            modules
+            ++ (
+              # TODO: remove once everything has bee moved to modules.
+              if builtins.pathExists "${self}/hosts/${hostname}/configuration.nix" then
+                "${self}/hosts/${hostname}/configuration.nix"
+              else
+                [ ]
+            )
+            ++ [
+              (config.flake.modules.nixos."nixosConfigurations/${hostname}" or { })
+            ];
 
           specialArgs = specialArgs // {
             inherit hostname stateVersion system;
@@ -38,17 +47,13 @@
     in
     {
       nixosConfigurations = {
-        nixedo = mkNixosConfiguration rec {
+        nixedo = mkHost {
           hostname = "nixedo";
           stateVersion = "24.11";
-
-          modules = [ config.flake.modules.nixos."nixosConfigurations/${hostname}" ];
         };
 
-        t480 = mkNixosConfiguration rec {
+        t480 = mkHost {
           hostname = "t480";
-
-          modules = [ config.flake.modules.nixos."nixosConfigurations/${hostname}" ];
         };
       };
     };