diff --git a/flake.nix b/flake.nix
index b4c08d0..dd362be 100644
--- a/flake.nix
+++ b/flake.nix
@@ -66,17 +66,24 @@
       ];
       specialArgs = {
         ## Custom variables (e.g. ip, interface, etc)
-        vars = (import ./systems/server/userdata.nix); 
+        vars = (import ./systems/server/userdata.nix);
         inherit inputs ;
       };
     };
     nixosConfigurations."nix-laptop" = nixpkgs.lib.nixosSystem {
         inherit system;
-        specialArgs = {inherit inputs; };
+        specialArgs = {
+          ## Custom variables (e.g. ip, interface, etc)
+          vars = (import ./systems/laptop/userdata.nix);
+          inherit inputs ;
+        };
         modules = [
           ./users/kopatz.nix
+          # Todo: refactor file layout
           ./laptop/configuration.nix
           ./modules/virt-manager.nix
+          ./modules/ssh.nix
+          ./modules/wake-on-lan.nix
           nixos-hardware.nixosModules.dell-xps-15-7590-nvidia
           agenix.nixosModules.default
           home-manager.nixosModules.home-manager
@@ -84,10 +91,17 @@
     };
     nixosConfigurations."nix-laptop-no-gpu" = nixpkgs.lib.nixosSystem {
         inherit system;
-        specialArgs = {inherit inputs; };
+        specialArgs = {
+          ## Custom variables (e.g. ip, interface, etc)
+          vars = (import ./systems/laptop/userdata.nix);
+          inherit inputs ;
+        };
         modules = [
           ./users/kopatz.nix
           ./laptop/configuration.nix
+          ./modules/virt-manager.nix
+          ./modules/ssh.nix
+          ./modules/wake-on-lan.nix
           nixos-hardware.nixosModules.dell-xps-15-7590
           agenix.nixosModules.default
           home-manager.nixosModules.home-manager
@@ -95,7 +109,7 @@
     };
     nixosConfigurations."wsl" = nixpkgs.lib.nixosSystem {
         inherit system;
-        specialArgs = { inherit inputs; };
+        specialArgs = {inherit inputs ;};
         modules = [
           #"${nixpkgs}/nixos/modules/profiles/minimal.nix"
           ./users/anon.nix
diff --git a/laptop/main.nix b/laptop/main.nix
index 15c5cfb..8185c87 100644
--- a/laptop/main.nix
+++ b/laptop/main.nix
@@ -18,7 +18,6 @@ in
     [ # Include the results of the hardware scan.
 	./hardware-configuration.nix
 	./modules/battery.nix
-	./modules/ssh.nix
 	#./modules/wireguard.nix
 	## -- set in flake.nix
 	#<nixos-hardware/dell/xps/15-7590/nvidia>
@@ -99,7 +98,7 @@ in
   ];
 
   networking.firewall = {
-    enable = false;
+    enable = true;
     allowedTCPPortRanges = [
       { from = 1714; to = 1764; } # KDE Connect
     ];
diff --git a/laptop/modules/ssh.nix b/laptop/modules/ssh.nix
deleted file mode 100644
index a9cf9e1..0000000
--- a/laptop/modules/ssh.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-      services.openssh = {
-        enable = true;
-        ports = [];
-        openFirewall = false;
-        settings = {
-            PermitRootLogin = "no";
-            PasswordAuthentication = false;
-        };
-      };
-}
diff --git a/modules/ssh.nix b/modules/ssh.nix
index 128517a..e9370f5 100644
--- a/modules/ssh.nix
+++ b/modules/ssh.nix
@@ -7,9 +7,4 @@
         settings.PermitRootLogin = "no";
         settings.X11Forwarding = true;
     };
-
-    users.users.anon.openssh.authorizedKeys.keys = [
-        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDb14svyGa2WprTNrtaI5yRl9KP+wzmLueFsHQww0Y6D2CZ5ZEEwoGFg7PrjWzVa/tXYn5AO1ng5eMCRbZPjtX03of448HTAEV8B0BFV9BuemoIBf14TRZ6lhGfQvD7BlTVZ5jKGUUJBfRdf0CZ8Ed5dk77u0xGV8+p3dYAQXowOmOyYFiDg6baKQcLM5Pz2zVxK1GySehEJ4n7GYNjyv7hJhfWMbaE10rIB0V0TuM8yeYvBvIxfGfMzlm4izOHbuSYR1v6RCuQKn1JOQiYqAkYCsXG/4XssMXpl2KxGvp67OJNotIHzap8zRDr7KH8Sk8jHuBFCnqbxDEqzs72Qtan Kopatz@Kopatz-PC"
-        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCsicFT8H/XHR3c0nN6f3dmChxLlkIYalUEQPqP2qROkX7Na6cMXoFiRvegvVPBCgR+DKagp7G2fttZVZ51yBBZ4G/rzDMgKIFgTDNaDeyGWx2n2zCHM5/wletoqTU6ezOUKOEvOfpsZnpcUqVmYtxlrMpakItrtSO+5mawlTKiDTqtazxLfFuyQFzlXVfVcJacxEupd+Ilmp8Y/e8pp6+jGYZ9asNuQKuGDaCepkhsPEGq/cK9AqaATdx/F81H1metV+kf6A3eDlcyzZy+x41GSofiR6HFgUzYafe5uddMVtL7JIKHHPQVpMMqPxkD3tphozh0fq3C9v8aThcqkvoU9eFD7PcN+8U6guA6Qf7cysGXb3pnvrfSeKGlxxpUAxLcpHlJnP66c7/TVRe2buAYFQqykrmRmJfLwqpY2UHoshpcGTwULslEHCMC5/wgc3BPgVGUB148d7F36bS1jTJlRGqwzf712CKnwW122xTZawgybrr8A5Q/bSRFtpz5wys= kopatz@Kopatz-PC2"
-    ];
 }
diff --git a/modules/wake-on-lan.nix b/modules/wake-on-lan.nix
new file mode 100644
index 0000000..a9d23e1
--- /dev/null
+++ b/modules/wake-on-lan.nix
@@ -0,0 +1,7 @@
+{ config, pkgs, lib, vars, ... }:
+let
+  interface = vars.interface;
+in
+{
+  networking.interfaces.${interface}.wakeOnLan.enable;
+}
diff --git a/systems/laptop/userdata.nix b/systems/laptop/userdata.nix
new file mode 100644
index 0000000..8fbd094
--- /dev/null
+++ b/systems/laptop/userdata.nix
@@ -0,0 +1,4 @@
+
+{
+  interface = "enp0s31f6";
+}
diff --git a/users/anon.nix b/users/anon.nix
index 85b134a..fb9cd97 100644
--- a/users/anon.nix
+++ b/users/anon.nix
@@ -44,5 +44,8 @@ in
     packages = with pkgs; [
       firefox
     ];
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFeP6qtVqE/gu72ZUZE8cdRi3INiUW9NqDR7SjXIzTw2 lukas"
+    ];
   };
 }
diff --git a/users/kopatz.nix b/users/kopatz.nix
index 888a4fd..788031b 100644
--- a/users/kopatz.nix
+++ b/users/kopatz.nix
@@ -48,5 +48,8 @@ in
       librewolf
       ungoogled-chromium
     ];
+    openssh.authorizedKeys.keys = [
+       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFeP6qtVqE/gu72ZUZE8cdRi3INiUW9NqDR7SjXIzTw2 lukas"
+    ];
   };
 }