diff --git a/config/targets/default.nix b/config/targets/default.nix
deleted file mode 100644
index 1197886d..00000000
--- a/config/targets/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    ./personal
-    ./infra
-  ];
-}
diff --git a/default.nix b/default.nix
index 47734c74..6270c63b 100644
--- a/default.nix
+++ b/default.nix
@@ -8,6 +8,9 @@ let
   profiles = lib.modList {
     modulesDir = ./config/profiles;
   };
+  targets = lib.removeAttrs (lib.modList {
+    modulesDir = ./config/targets;
+  }) ["common"];
   users = lib.modList {
     modulesDir = ./config/users;
   };
@@ -26,7 +29,8 @@ let
   eval = lib.evalModules {
     modules = [
       metaConfig
-      ./config/targets
+      targets.personal
+      targets.infra
       ./config/modules/meta/default.nix
     ] ++ map (hostName: ./config/hosts + "/${hostName}/meta.nix") hostNames;
     specialArgs = {