diff --git a/nixos/base.nix b/nixos/base.nix
index f0363cc1..206c6ccf 100644
--- a/nixos/base.nix
+++ b/nixos/base.nix
@@ -1,10 +1,11 @@
 { config, pkgs, options, inputs, ... }:
 {
   imports = [
-    ./nix.nix
-    ./users.nix
-    ./essential.nix
     ./environment.nix
+    ./essential.nix
+    ./nix.nix
+    ./ssh.nix
+    ./users.nix
   ];
 
   nixpkgs.config.permittedInsecurePackages = [
@@ -46,22 +47,6 @@
     '';
   };
 
-  services.avahi = {
-    enable = true;
-    nssmdns = true;
-    publish = {
-      enable = true;
-      domain = true;
-      workstation = true;
-      userServices = true;
-      addresses = true;
-      hinfo = true;
-    };
-    extraServiceFiles = {
-      ssh = "''${pkgs.avahi}/etc/avahi/services/ssh.service";
-    };
-  };
-
   # Audio
   sound.enable = true;
   hardware.pulseaudio.enable = true;
@@ -88,8 +73,6 @@
 
   services.gnome.gnome-keyring.enable = true;
 
-  services.openssh.enable = true;
-
   services.locate.enable = true;
 
   virtualisation.docker.enable = true;
diff --git a/nixos/ssh.nix b/nixos/ssh.nix
new file mode 100644
index 00000000..4a86f67d
--- /dev/null
+++ b/nixos/ssh.nix
@@ -0,0 +1,20 @@
+{ config, pkgs, ... }:
+{
+  services.avahi = {
+    enable = true;
+    nssmdns = true;
+    publish = {
+      enable = true;
+      domain = true;
+      workstation = true;
+      userServices = true;
+      addresses = true;
+      hinfo = true;
+    };
+    extraServiceFiles = {
+      ssh = "''${pkgs.avahi}/etc/avahi/services/ssh.service";
+    };
+  };
+
+  services.openssh.enable = true;
+}
diff --git a/nixos/wsl.nix b/nixos/wsl.nix
index 88b6dfe7..b5f5661a 100644
--- a/nixos/wsl.nix
+++ b/nixos/wsl.nix
@@ -2,6 +2,7 @@
 {
   imports = [
     inputs.nixos-wsl.nixosModules.wsl
+    ./ssh.nix
     ./environment.nix
     ./essential.nix
     ./fonts.nix
@@ -22,8 +23,7 @@
     startMenuLaunchers = true;
     nativeSystemd = true;
 
-    # Enable native Docker support
-    # docker-native.enable = true;
+    docker-native.enable = true;
 
     # Enable integration with Docker Desktop (needs to be installed)
     # docker-desktop.enable = true;