diff --git a/hosts/galanthus/configuration.nix b/hosts/galanthus/configuration.nix
index bd955ed..4335df4 100644
--- a/hosts/galanthus/configuration.nix
+++ b/hosts/galanthus/configuration.nix
@@ -9,8 +9,15 @@
   imports = [
     inputs.agenix.nixosModules.default
     inputs.copyparty.nixosModules.default
+
     ./hardware-configuration.nix
-    ../../modules/nixos
+
+    ../../modules/nixos/tailscale.nix
+    ../../modules/nixos/jellyfin.nix
+    ../../modules/nixos/immich.nix
+    ../../modules/nixos/paperless.nix
+    ../../modules/nixos/copyparty.nix
+    ../../modules/nixos/samba.nix
   ];
 
   boot = {
diff --git a/hosts/nimbus/configuration.nix b/hosts/nimbus/configuration.nix
index 6a15891..7200217 100644
--- a/hosts/nimbus/configuration.nix
+++ b/hosts/nimbus/configuration.nix
@@ -7,7 +7,9 @@
 {
   imports = [
     inputs.agenix.nixosModules.default
+
     ./hardware-configuration.nix
+
     ../../modules/nixos/tailscale.nix
     ../../modules/nixos/caddy.nix
     ../../modules/nixos/matrix.nix
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
deleted file mode 100644
index a30a033..0000000
--- a/modules/nixos/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  imports = [
-    ./copyparty.nix
-    # ./forgejo.nix
-    ./immich.nix
-    ./jellyfin.nix
-    # ./minecraft.nix
-    ./paperless.nix
-    ./samba.nix
-    ./tailscale.nix
-  ];
-}