diff --git a/flake.nix b/flake.nix
index 5e30558..26dc2e7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -145,43 +145,41 @@
         };
       };
 
-      nixosModules = {
-        lix = (import ./nixosModules/lix.nix);
-        kdeconnect = (import ./nixosModules/kdeconnect.nix);
-        globalinstalls = (import ./nixosModules/globalinstalls.nix);
-        autoupdate = (import ./nixosModules/autoupdate.nix);
-        en-de =  (import ./nixosModules/en-de.nix);
-        niri = {
-          imports = [ niri.nixosModules.niri ];
-          nixpkgs.overlays = [ niri.overlays.niri ];
-        };
-        pkgs-unstable = {
-          nixpkgs.overlays = [ nix-vscode-extensions.overlays.default ];
-        };
-        desktopDefault = {
-          imports = [
-            self.nixosModules.pkgs-unstable
-            self.nixosModules.niri
-            self.nixosModules.kdeconnect
-            self.nixosModules.en-de
+      nixosModules =
+        (builtins.mapAttrs (m: _: import ./nixosModules/${m}) (builtins.readDir ./nixosModules))
+        // {
+          niri = {
+            imports = [ niri.nixosModules.niri ];
+            nixpkgs.overlays = [ niri.overlays.niri ];
+          };
+          pkgs-unstable = {
+            nixpkgs.overlays = [ nix-vscode-extensions.overlays.default ];
+          };
+          desktopDefault = {
+            imports = [
+              self.nixosModules.pkgs-unstable
+              self.nixosModules.niri
+              self.nixosModules.kdeconnect
+              self.nixosModules.en-de
 
-            home-manager.nixosModules.home-manager
-            servicepoint-simulator.nixosModules.default
-            servicepoint-cli.nixosModules.default
+              home-manager.nixosModules.home-manager
+              servicepoint-simulator.nixosModules.default
+              servicepoint-cli.nixosModules.default
 
-            ./modules/home-manager.nix
-          ];
+              ./modules/home-manager.nix
+            ];
+          };
+          default = {
+            imports = with self.nixosModules; [
+              lix
+              globalinstalls
+              autoupdate
+              openssh
+              ./modules/networking.nix
+              ./modules/nixpkgs.nix
+            ];
+          };
         };
-        default = {
-          imports = with self.nixosModules; [
-            lix
-            globalinstalls
-            autoupdate
-            ./modules/networking.nix
-            ./modules/nixpkgs.nix
-          ];
-        };
-      };
 
       formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-tree);
     };
diff --git a/modules/networking.nix b/modules/networking.nix
index a6a8d03..68ce3ea 100644
--- a/modules/networking.nix
+++ b/modules/networking.nix
@@ -1,15 +1,5 @@
 _: {
   config = {
-    services.openssh = {
-      enable = true;
-      openFirewall = true;
-      settings = {
-        PermitRootLogin = "without-password";
-        PasswordAuthentication = false;
-        KbdInteractiveAuthentication = false;
-      };
-    };
-
     services.tailscale = {
       enable = true;
       openFirewall = true;
diff --git a/nixosModules/openssh.nix b/nixosModules/openssh.nix
new file mode 100644
index 0000000..ed24fe2
--- /dev/null
+++ b/nixosModules/openssh.nix
@@ -0,0 +1,11 @@
+{
+  services.openssh = {
+    enable = true;
+    openFirewall = true;
+    settings = {
+      PermitRootLogin = "without-password";
+      PasswordAuthentication = false;
+      KbdInteractiveAuthentication = false;
+    };
+  };
+}