diff --git a/flake.nix b/flake.nix
index cdc2bf4..6667dad 100644
--- a/flake.nix
+++ b/flake.nix
@@ -102,49 +102,18 @@
       devices = {
         vinzenz-lpt2 = {
           system = "x86_64-linux";
-          additional-modules = [
-            self.nixosModules.user-vinzenz
-
-            self.nixosModules.gnome
-            self.nixosModules.wine-gaming
-            self.nixosModules.steam
-            self.nixosModules.podman
-            self.nixosModules.vinzenz-desktop-settings
-            self.nixosModules.intel-graphics
-            self.nixosModules.secure-boot
-          ];
           home-manager-users = {
             inherit (self.homeConfigurations) vinzenz;
           };
         };
         vinzenz-pc2 = {
           system = "x86_64-linux";
-          additional-modules = [
-            self.nixosModules.user-vinzenz
-            self.nixosModules.user-ronja
-
-            self.nixosModules.gnome
-            self.nixosModules.wine-gaming
-            self.nixosModules.steam
-            self.nixosModules.podman
-            self.nixosModules.vinzenz-desktop-settings
-            self.nixosModules.amd-graphics
-            self.nixosModules.secure-boot
-          ];
           home-manager-users = {
-            inherit (self.homeConfigurations) vinzenz ronja;
+            inherit (self.homeConfigurations) vinzenz;
           };
         };
         ronja-pc = {
           system = "x86_64-linux";
-          additional-modules = [
-            self.nixosModules.user-ronja
-
-            self.nixosModules.gnome
-            self.nixosModules.steam
-            self.nixosModules.wine-gaming
-            self.nixosModules.vinzenz-desktop-settings
-          ];
           home-manager-users = {
             inherit (self.homeConfigurations) ronja;
           };
@@ -154,7 +123,6 @@
         };
         forgejo-runner-1 = {
           system = "aarch64-linux";
-          additional-modules = [ self.nixosModules.podman ];
         };
       };
       inherit (nixpkgs) lib;
@@ -230,11 +198,11 @@
           device,
           system,
           home-manager-users ? { },
-          additional-modules ? [ ],
         }:
         let
           specialArgs = {
             inherit device;
+            my-nixos-modules = self.nixosModules;
           };
         in
         nixpkgs.lib.nixosSystem {
@@ -326,8 +294,7 @@
             servicepoint-tanks.nixosModules.default
             stylix.nixosModules.stylix
             # keep-sorted end
-          ])
-          ++ additional-modules;
+          ]);
         }
       );
 
diff --git a/nixosConfigurations/forgejo-runner-1/default.nix b/nixosConfigurations/forgejo-runner-1/default.nix
index f9d3c3f..16cf0e5 100644
--- a/nixosConfigurations/forgejo-runner-1/default.nix
+++ b/nixosConfigurations/forgejo-runner-1/default.nix
@@ -1,7 +1,9 @@
+{ my-nixos-modules, ... }:
 {
   imports = [
     ./hardware.nix
     ./forgejo-runner.nix
+    my-nixos-modules.podman
   ];
 
   config = {
diff --git a/nixosConfigurations/ronja-pc/default.nix b/nixosConfigurations/ronja-pc/default.nix
index dd22382..18058a5 100644
--- a/nixosConfigurations/ronja-pc/default.nix
+++ b/nixosConfigurations/ronja-pc/default.nix
@@ -1,11 +1,17 @@
 {
   config,
   pkgs,
+  my-nixos-modules,
   ...
 }:
 {
   imports = [
     ./hardware.nix
+    my-nixos-modules.user-ronja
+    my-nixos-modules.gnome
+    my-nixos-modules.steam
+    my-nixos-modules.wine-gaming
+    my-nixos-modules.vinzenz-desktop-settings
   ];
 
   config = {
diff --git a/nixosConfigurations/vinzenz-lpt2/default.nix b/nixosConfigurations/vinzenz-lpt2/default.nix
index 38e9a3f..1478a41 100644
--- a/nixosConfigurations/vinzenz-lpt2/default.nix
+++ b/nixosConfigurations/vinzenz-lpt2/default.nix
@@ -1,6 +1,15 @@
+{ my-nixos-modules, ... }:
 {
   imports = [
     ./hardware.nix
+    my-nixos-modules.user-vinzenz
+    my-nixos-modules.gnome
+    my-nixos-modules.wine-gaming
+    my-nixos-modules.steam
+    my-nixos-modules.podman
+    my-nixos-modules.vinzenz-desktop-settings
+    my-nixos-modules.intel-graphics
+    my-nixos-modules.secure-boot
   ];
 
   config = {
diff --git a/nixosConfigurations/vinzenz-pc2/default.nix b/nixosConfigurations/vinzenz-pc2/default.nix
index 23505b1..6ebbc16 100644
--- a/nixosConfigurations/vinzenz-pc2/default.nix
+++ b/nixosConfigurations/vinzenz-pc2/default.nix
@@ -1,9 +1,18 @@
-{ pkgs, ... }:
+{ pkgs, my-nixos-modules, ... }:
 {
   imports = [
     ./hardware.nix
     ./vscode-server.nix
     ./hass.nix
+
+    my-nixos-modules.user-vinzenz
+    my-nixos-modules.gnome
+    my-nixos-modules.wine-gaming
+    my-nixos-modules.steam
+    my-nixos-modules.podman
+    my-nixos-modules.vinzenz-desktop-settings
+    my-nixos-modules.amd-graphics
+    my-nixos-modules.secure-boot
   ];
 
   config = {
@@ -27,11 +36,6 @@
       ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDNpLDmctyqGpow/ElQvdhY4BLBPS/sigDJ1QEcC7wC vinzenz-lpt2-roaming''
     ];
 
-    users.users.ronja.openssh.authorizedKeys.keys = [
-      ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIALWKm+d6KL6Vl3grPOcGouiNTkvdhXuWJmcrdEBY2nw ssh-host-key''
-      ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEgN6J8KyVyQqBAz+y3drXDmIsxOPkdPB+ISgpIP9Eld Generated By Termius''
-    ];
-
     environment.systemPackages = with pkgs; [ lact ];
 
     networking.firewall.allowedUDPPorts = [