diff --git a/nixos-configurations/calanda/default.nix b/nixos-configurations/calanda/default.nix
index cafe59b..a397319 100644
--- a/nixos-configurations/calanda/default.nix
+++ b/nixos-configurations/calanda/default.nix
@@ -6,8 +6,6 @@
     ./filesystems.nix
 
     ../../defaults/hardware/apu.nix
-
-    ../../defaults/meta
   ];
 
   qois.system.physical.enable = true;
diff --git a/nixos-configurations/cyprianspitz/default.nix b/nixos-configurations/cyprianspitz/default.nix
index 36ccb08..fd20520 100644
--- a/nixos-configurations/cyprianspitz/default.nix
+++ b/nixos-configurations/cyprianspitz/default.nix
@@ -10,8 +10,6 @@
     ./virtualisation.nix
 
     ../../defaults/hardware/asrock-z790m.nix
-
-    ../../defaults/meta
   ];
 
   qois.system.physical.enable = true;
diff --git a/nixos-configurations/default.nix b/nixos-configurations/default.nix
index 2aac144..475d6d5 100644
--- a/nixos-configurations/default.nix
+++ b/nixos-configurations/default.nix
@@ -2,8 +2,6 @@
   self,
   pkgs,
   nixpkgs-nixos-stable,
-  disko,
-  sops-nix,
   ...
 }@inputs:
 let
@@ -19,11 +17,8 @@ genAttrs configs (
       inherit inputs;
     };
     modules = [
-      disko.nixosModules.disko
-      sops-nix.nixosModules.sops
       self.nixosModules.default
       ./${config}/default.nix
-      ./secrets.nix
     ];
   }
 )
diff --git a/nixos-configurations/lindberg-build/default.nix b/nixos-configurations/lindberg-build/default.nix
index 05af11d..dc3a626 100644
--- a/nixos-configurations/lindberg-build/default.nix
+++ b/nixos-configurations/lindberg-build/default.nix
@@ -2,7 +2,6 @@
 
 {
   imports = [
-    ../../defaults/meta
 
     ./applications
     ./disko-config.nix
diff --git a/nixos-configurations/lindberg-nextcloud/default.nix b/nixos-configurations/lindberg-nextcloud/default.nix
index 608fc51..3bfc14a 100644
--- a/nixos-configurations/lindberg-nextcloud/default.nix
+++ b/nixos-configurations/lindberg-nextcloud/default.nix
@@ -2,7 +2,6 @@
 
 {
   imports = [
-    ../../defaults/meta
     ./applications
     ./backup.nix
     ./secrets.nix
diff --git a/nixos-configurations/lindberg-webapps/default.nix b/nixos-configurations/lindberg-webapps/default.nix
index 0efcd1d..00b64a7 100644
--- a/nixos-configurations/lindberg-webapps/default.nix
+++ b/nixos-configurations/lindberg-webapps/default.nix
@@ -2,8 +2,6 @@
 
 {
   imports = [
-    ../../defaults/meta
-
     ./applications
     ./disko-config.nix
     ./networking.nix
diff --git a/nixos-configurations/lindberg/default.nix b/nixos-configurations/lindberg/default.nix
index e39e769..2bf286c 100644
--- a/nixos-configurations/lindberg/default.nix
+++ b/nixos-configurations/lindberg/default.nix
@@ -11,8 +11,6 @@
     ./virtualisation.nix
 
     ../../defaults/hardware/asrock.nix
-
-    ../../defaults/meta
   ];
 
   qois.system.physical.enable = true;
diff --git a/nixos-configurations/stompert/default.nix b/nixos-configurations/stompert/default.nix
index d5c7cd0..688aa31 100644
--- a/nixos-configurations/stompert/default.nix
+++ b/nixos-configurations/stompert/default.nix
@@ -7,8 +7,6 @@
 {
   imports = [
     ../../defaults/hardware/apu.nix
-
-    ../../defaults/meta
   ];
 
   qois.system.physical.enable = true;
diff --git a/nixos-modules/default.nix b/nixos-modules/default.nix
index 7c852dc..4e50c08 100644
--- a/nixos-modules/default.nix
+++ b/nixos-modules/default.nix
@@ -1,9 +1,20 @@
-{ private, self, ... }:
+{
+  private,
+  self,
+  disko,
+  sops-nix,
+  ...
+}:
 {
   default =
     { ... }:
     {
 
-      imports = (self.lib.loadSubmodulesFrom ./.) ++ [ private.nixosModules.default ];
+      imports = (self.lib.loadSubmodulesFrom ./.) ++ [
+        ../defaults/meta
+        disko.nixosModules.disko
+        sops-nix.nixosModules.sops
+        private.nixosModules.default
+      ];
     };
 }
diff --git a/nixos-modules/system/default.nix b/nixos-modules/system/default.nix
index a0a0cff..81670da 100644
--- a/nixos-modules/system/default.nix
+++ b/nixos-modules/system/default.nix
@@ -11,6 +11,7 @@
     ./overlays.nix
     ./physical.nix
     ./security.nix
+    ./secrets.nix
     ./virtual-machine.nix
   ];
 
diff --git a/nixos-configurations/secrets.nix b/nixos-modules/system/secrets.nix
similarity index 100%
rename from nixos-configurations/secrets.nix
rename to nixos-modules/system/secrets.nix