diff --git a/nixos/configurations.nix b/nixos/configurations.nix
index 33cd63a..3beeadd 100644
--- a/nixos/configurations.nix
+++ b/nixos/configurations.nix
@@ -5,7 +5,6 @@
 , nixos-hardware
 }:
 let adapterModule = {
-  imports = [ ./modules ];
   nix.nixPath = [
     "home-manager=${home-manager}"
     "nixpkgs=${nixpkgs}"
@@ -28,7 +27,7 @@ in
 {
   gorgon = nixosSystem {
     system = "x86_64-linux";
-    modules = [
+    modules = (nixpkgs.lib.attrValues self.nixosModules) ++ [
       adapterModule
       nixos-hardware.nixosModules.lenovo-thinkpad-t14s-amd-gen1
       #home-manager.nixosModules.home-manager
@@ -43,7 +42,7 @@ in
   };
   ifrit = nixosSystem {
     system = "x86_64-linux";
-    modules = [
+    modules = (nixpkgs.lib.attrValues self.nixosModules) ++ [
       adapterModule
       ./modules/profiles/server.nix
       ./ifrit/configuration.nix
@@ -52,7 +51,7 @@ in
 
   surgat = nixosSystem {
     system = "x86_64-linux";
-    modules = [
+    modules = (nixpkgs.lib.attrValues self.nixosModules) ++ [
       adapterModule
       ./modules/profiles/server.nix
       ./surgat/configuration.nix
@@ -60,7 +59,7 @@ in
   };
   pruflas = nixosSystem {
     system = "x86_64-linux";
-    modules = [
+    modules = (nixpkgs.lib.attrValues self.nixosModules) ++ [
       adapterModule
       ./modules/profiles/server.nix
       ./pruflas/configuration.nix
diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix
index b7d7da6..8e2b55a 100644
--- a/nixos/modules/default.nix
+++ b/nixos/modules/default.nix
@@ -1,19 +1,16 @@
-{ ... }:
 {
-  imports = [
-    ./admin.nix
-    ./backup.nix
-    ./element.nix
-    ./fido2.nix
-    ./fileShare.nix
-    ./gitea.nix
-    ./headphones.nix
-    ./homepage.nix
-    ./networking.nix
-    ./share.nix
-    ./steam.nix
-    ./update.nix
-    ./vpnServer.nix
-    ./weechat.nix
-  ];
+  admin = import ./admin.nix;
+  backup = import ./backup.nix;
+  element = import ./element.nix;
+  fido2 = import ./fido2.nix;
+  fileShare = import ./fileShare.nix;
+  gitea = import ./gitea.nix;
+  headphones = import ./headphones.nix;
+  homepage = import ./homepage.nix;
+  networking = import ./networking.nix;
+  share = import ./share.nix;
+  steam = import ./steam.nix;
+  update = import ./update.nix;
+  vpnServer = import ./vpnServer.nix;
+  weechat = import ./weechat.nix;
 }
diff --git a/outputs.nix b/outputs.nix
index 2f7ed10..c2c3b0f 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -62,7 +62,7 @@
     nixosSystem = nixpkgs.lib.nixosSystem;
     inherit self nixpkgs home-manager nixos-hardware;
   };
-  nixosModule = import ./nixos/modules;
+  nixosModules = import ./nixos/modules;
   overlays = import ./overlays;
   pythonPackages = import ./pkgs/python-pkgs;