diff --git a/doc/src/module/disks.md b/doc/src/module/disks.md
index 7febccb..926f98c 100644
--- a/doc/src/module/disks.md
+++ b/doc/src/module/disks.md
@@ -1,5 +1,5 @@
 # Disks
-The disks module can be used by importing `inputs.self.nixosModules.malobeo.disko`
+The disks module can be used by importing `inputs.malobeo.nixosModules.malobeo.disko`
 
 
 #### `let cfg = malobeo.disks`
diff --git a/doc/src/module/gitea-translator.md b/doc/src/module/gitea-translator.md
index 389950d..13e74c6 100644
--- a/doc/src/module/gitea-translator.md
+++ b/doc/src/module/gitea-translator.md
@@ -1,5 +1,5 @@
 # Gitea-tanslator
-The module can be used by importing `inputs.self.nixosModules.malobeo.gitea-translator`
+The module can be used by importing `inputs.malobeo.nixosModules.malobeo.gitea-translator`
 
 This module starts a python server that fetches the gitea pull request api and translates it to a file that hydra understands.   
 To use, just set the parameters of the gitea server, then send a GET request to either `http://${host}:${port}/` or `http://${host}:${port}/gitea-pulls-sorted.json`
diff --git a/doc/src/module/initssh.md b/doc/src/module/initssh.md
index d87fbe0..12310a1 100644
--- a/doc/src/module/initssh.md
+++ b/doc/src/module/initssh.md
@@ -1,5 +1,5 @@
 # Initrd-ssh
-The initssh module can be used by importing `inputs.self.nixosModules.malobeo.initssh`
+The initssh module can be used by importing `inputs.malobeo.nixosModules.malobeo.initssh`
 
 #### `let cfg = malobeo.initssh`
 
@@ -26,4 +26,4 @@ Run ` lspci -k | grep -iA4 ethernet `
 ` [ ] `
 
 *Example:*
-`[ "r8169" ]`
\ No newline at end of file
+`[ "r8169" ]`
diff --git a/machines/albert/configuration.nix b/machines/albert/configuration.nix
index a202102..26b429a 100644
--- a/machines/albert/configuration.nix
+++ b/machines/albert/configuration.nix
@@ -15,17 +15,18 @@ in
   sops.secrets.wg_private = {};
 
   imports =
-    [ # Include the results of the hardware scan.
+    [
+      inputs.malobeo.nixosModules.malobeo.vpn
+      inputs.malobeo.nixosModules.malobeo.initssh
+      inputs.malobeo.nixosModules.malobeo.disko
+      inputs.malobeo.nixosModules.malobeo.metrics
+      inputs.malobeo.nixosModules.malobeo.users
+      inputs.malobeo.nixosModules.malobeo.backup
+
       #./hardware-configuration.nix
       ../modules/sshd.nix
       ../modules/minimal_tools.nix
       ../modules/autoupdate.nix
-      inputs.self.nixosModules.malobeo.vpn
-      inputs.self.nixosModules.malobeo.initssh
-      inputs.self.nixosModules.malobeo.disko
-      inputs.self.nixosModules.malobeo.metrics
-      inputs.self.nixosModules.malobeo.users
-      inputs.self.nixosModules.malobeo.backup
       ./hydra.nix
       ./gitea_runner.nix
     ];
diff --git a/machines/albert/hydra.nix b/machines/albert/hydra.nix
index d484b93..122fb8d 100644
--- a/machines/albert/hydra.nix
+++ b/machines/albert/hydra.nix
@@ -15,7 +15,7 @@
 
   imports =
     [
-      inputs.self.nixosModules.malobeo.gitea-translator
+      inputs.malobeo.nixosModules.malobeo.gitea-translator
     ];
 
   services.malobeo.gitea-translator = {
diff --git a/machines/antamap/configuration.nix b/machines/antamap/configuration.nix
index 24dd5f7..1a167ba 100644
--- a/machines/antamap/configuration.nix
+++ b/machines/antamap/configuration.nix
@@ -1,4 +1,4 @@
-{ self, config, lib, pkgs, inputs, ... }:
+{ config, lib, pkgs, inputs, ... }:
 
 with lib;
 
@@ -22,7 +22,8 @@ in
   };
 
   imports = [
-    self.nixosModules.malobeo.users
+    inputs.malobeo.nixosModules.malobeo.users
+
     ../modules/sshd.nix
   ];
 
diff --git a/machines/bakunin/configuration.nix b/machines/bakunin/configuration.nix
index 392cca6..efada68 100644
--- a/machines/bakunin/configuration.nix
+++ b/machines/bakunin/configuration.nix
@@ -6,13 +6,14 @@ in
 {
   imports =
     [ # Include the results of the hardware scan.
+      inputs.malobeo.nixosModules.malobeo.disko
+      inputs.malobeo.nixosModules.malobeo.initssh
+      inputs.malobeo.nixosModules.malobeo.users
+
       #./hardware-configuration.nix
       ../modules/xserver.nix
       ../modules/sshd.nix
       ../modules/autoupdate.nix
-      inputs.self.nixosModules.malobeo.disko
-      inputs.self.nixosModules.malobeo.initssh
-      inputs.self.nixosModules.malobeo.users
     ];
 
   malobeo.autoUpdate = {
diff --git a/machines/durruti/configuration.nix b/machines/durruti/configuration.nix
index 3a6a5d4..b57e298 100644
--- a/machines/durruti/configuration.nix
+++ b/machines/durruti/configuration.nix
@@ -1,4 +1,4 @@
-{ config, self, lib, pkgs, inputs, ... }:
+{ config, lib, pkgs, inputs, ... }:
 
 with lib;
 
@@ -17,10 +17,10 @@ with lib;
   ];
 
   imports = [
-    self.nixosModules.malobeo.metrics
+    inputs.malobeo.nixosModules.malobeo.metrics
+    inputs.malobeo.nixosModules.malobeo.users
     inputs.tasklist.nixosModules.malobeo-tasklist
 
-    self.nixosModules.malobeo.users
     ../modules/sshd.nix
     ../modules/minimal_tools.nix
   ];
diff --git a/machines/fanny/configuration.nix b/machines/fanny/configuration.nix
index c97f244..9f9abba 100644
--- a/machines/fanny/configuration.nix
+++ b/machines/fanny/configuration.nix
@@ -11,18 +11,19 @@ in
   sops.secrets.njala_api_key = {};
 
   imports =
-    [ # Include the results of the hardware scan.
+    [ 
+      inputs.malobeo.nixosModules.malobeo.vpn
+      inputs.malobeo.nixosModules.malobeo.initssh
+      inputs.malobeo.nixosModules.malobeo.disko
+      inputs.malobeo.nixosModules.malobeo.microvm
+      inputs.malobeo.nixosModules.malobeo.metrics
+      inputs.malobeo.nixosModules.malobeo.users
+      inputs.malobeo.nixosModules.malobeo.backup
+
       #./hardware-configuration.nix
       ../modules/sshd.nix
       ../modules/minimal_tools.nix
       ../modules/autoupdate.nix
-      inputs.self.nixosModules.malobeo.vpn
-      inputs.self.nixosModules.malobeo.initssh
-      inputs.self.nixosModules.malobeo.disko
-      inputs.self.nixosModules.malobeo.microvm
-      inputs.self.nixosModules.malobeo.metrics
-      inputs.self.nixosModules.malobeo.users
-      inputs.self.nixosModules.malobeo.backup
       ./dyndns.nix
     ];
 
@@ -192,7 +193,7 @@ in
         proxyPass = "http://${hosts.malobeo.hosts.nextcloud.network.address}";
         extraConfig = ''
           proxy_set_header Host $host;
-          client_max_body_size ${inputs.self.nixosConfigurations.nextcloud.config.services.nextcloud.maxUploadSize};
+          client_max_body_size ${inputs.malobeo.nixosConfigurations.nextcloud.config.services.nextcloud.maxUploadSize};
           client_body_timeout 3600s;
           send_timeout 3600s;
           fastcgi_buffers 64 4K;
@@ -207,7 +208,7 @@ in
         proxyPass = "http://${hosts.malobeo.hosts.nextcloud.network.address}";
         extraConfig = ''
           proxy_set_header Host $host;
-          client_max_body_size ${inputs.self.nixosConfigurations.nextcloud.config.services.nextcloud.maxUploadSize};
+          client_max_body_size ${inputs.malobeo.nixosConfigurations.nextcloud.config.services.nextcloud.maxUploadSize};
           client_body_timeout 3600s;
           send_timeout 3600s;
           fastcgi_buffers 64 4K;
diff --git a/machines/infradocs/configuration.nix b/machines/infradocs/configuration.nix
index d9fff57..a535b96 100644
--- a/machines/infradocs/configuration.nix
+++ b/machines/infradocs/configuration.nix
@@ -1,4 +1,4 @@
-{ self, config, lib, pkgs, inputs, ... }:
+{ config, lib, pkgs, inputs, ... }:
 
 with lib;
 
@@ -10,8 +10,9 @@ with lib;
 
   imports = [
     inputs.malobeo.nixosModules.malobeo.metrics
+    inputs.malobeo.nixosModules.malobeo.users
+
     ../durruti/documentation.nix
-    self.nixosModules.malobeo.users
     ../modules/sshd.nix
   ];
 
diff --git a/machines/louise/configuration.nix b/machines/louise/configuration.nix
index b3793c0..4f34e49 100644
--- a/machines/louise/configuration.nix
+++ b/machines/louise/configuration.nix
@@ -3,13 +3,14 @@
 {
   imports =
     [ # Include the results of the hardware scan.
+      inputs.malobeo.nixosModules.malobeo.printing
+
       ./hardware-configuration.nix
       ../modules/xserver.nix
       ../modules/malobeo_user.nix
       ../modules/sshd.nix
       ../modules/minimal_tools.nix
       ../modules/autoupdate.nix
-      inputs.self.nixosModules.malobeo.printing
     ];
 
   malobeo.autoUpdate = {
diff --git a/machines/lucia/configuration.nix b/machines/lucia/configuration.nix
index 5ddf07d..af9080c 100644
--- a/machines/lucia/configuration.nix
+++ b/machines/lucia/configuration.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, self, ... }:
+{ config, pkgs, inputs, ... }:
 
 let
   sshKeys = import ../ssh_keys.nix;
@@ -6,8 +6,9 @@ in
 {
   imports =
     [ # Include the results of the hardware scan.
+      inputs.malobeo.nixosModules.malobeo.users
+
       ./hardware_configuration.nix
-      self.nixosModules.malobeo.users
     ];
 
   malobeo.users = {
diff --git a/machines/modules/malobeo/users.nix b/machines/modules/malobeo/users.nix
index c2c1448..4c6f5b8 100644
--- a/machines/modules/malobeo/users.nix
+++ b/machines/modules/malobeo/users.nix
@@ -1,7 +1,7 @@
 {config, lib, pkgs, inputs, ...}:
 let 
   cfg = config.malobeo.users;
-  sshKeys = import ( inputs.self + /machines/ssh_keys.nix);
+  sshKeys = import ( inputs.malobeo + /machines/ssh_keys.nix);
   inherit (config.networking) hostName; 
 in
 {
diff --git a/machines/nextcloud/configuration.nix b/machines/nextcloud/configuration.nix
index 56436f7..458e151 100644
--- a/machines/nextcloud/configuration.nix
+++ b/machines/nextcloud/configuration.nix
@@ -1,4 +1,4 @@
-{ config, self, lib, pkgs,  ... }:
+{ config, lib, pkgs,  ... }:
 
 with lib;
 
@@ -20,8 +20,9 @@ in
   };
 
   imports = [
-    self.nixosModules.malobeo.metrics
-    self.nixosModules.malobeo.users
+    inputs.malobeo.nixosModules.malobeo.metrics
+    inputs.malobeo.nixosModules.malobeo.users
+
     ../modules/sshd.nix
     ../modules/minimal_tools.nix
     ../modules/autoupdate.nix
diff --git a/machines/ns1/configuration.nix b/machines/ns1/configuration.nix
index 4695053..338d750 100644
--- a/machines/ns1/configuration.nix
+++ b/machines/ns1/configuration.nix
@@ -1,4 +1,4 @@
-{ config, self, lib, inputs, pkgs,  ... }:
+{ config, lib, inputs, pkgs,  ... }:
 
 with lib;
 with inputs;
@@ -13,11 +13,12 @@ in
   };
 
   imports = [
-    self.nixosModules.malobeo.users
+    inputs.malobeo.nixosModules.malobeo.users
+    inputs.malobeo.nixosModules.malobeo.vpn
+
     ../modules/sshd.nix
     ../modules/minimal_tools.nix
     ../modules/autoupdate.nix
-    inputs.self.nixosModules.malobeo.vpn
   ];
 
   malobeo.users = {
diff --git a/machines/overwatch/configuration.nix b/machines/overwatch/configuration.nix
index 7b4b06b..7a08393 100644
--- a/machines/overwatch/configuration.nix
+++ b/machines/overwatch/configuration.nix
@@ -1,4 +1,4 @@
-{ config, self, lib, pkgs, inputs, ... }:
+{ config, lib, pkgs, inputs, ... }:
 
 with lib;
 
@@ -30,8 +30,9 @@ in
   };
 
   imports = [
-    self.nixosModules.malobeo.metrics
-    self.nixosModules.malobeo.users
+    inputs.malobeo.nixosModules.malobeo.metrics
+    inputs.malobeo.nixosModules.malobeo.users
+
     ../modules/sshd.nix
     ./printer_module.nix
   ];
diff --git a/machines/pretalx/configuration.nix b/machines/pretalx/configuration.nix
index 7cc0efc..8536408 100644
--- a/machines/pretalx/configuration.nix
+++ b/machines/pretalx/configuration.nix
@@ -1,4 +1,4 @@
-{ config, self, lib, pkgs, inputs,  ... }:
+{ config, lib, pkgs, inputs,  ... }:
 
 with lib;
 
@@ -21,9 +21,10 @@ in
 
   disabledModules = [ "services/web-apps/pretalx.nix" ];
   imports = [
+    inputs.malobeo.nixosModules.malobeo.metrics
+    inputs.malobeo.nixosModules.malobeo.users
+
     "${inputs.nixpkgs-unstable}/nixos/modules/services/web-apps/pretalx.nix"
-    self.nixosModules.malobeo.metrics
-    self.nixosModules.malobeo.users
     ../modules/sshd.nix
     ../modules/minimal_tools.nix
     ../modules/autoupdate.nix
diff --git a/machines/testvm/configuration.nix b/machines/testvm/configuration.nix
index befd0cc..3ded3b8 100644
--- a/machines/testvm/configuration.nix
+++ b/machines/testvm/configuration.nix
@@ -1,4 +1,4 @@
-{ config, self, pkgs, inputs, ... }:
+{ config, pkgs, inputs, ... }:
 let
   sshKeys = import ../ssh_keys.nix;
 in
@@ -6,11 +6,12 @@ in
   imports =
     [ # Include the results of the hardware scan.
       #./hardware-configuration.nix
-      self.nixosModules.malobeo.users
+      inputs.malobeo.nixosModules.malobeo.users
+      inputs.malobeo.nixosModules.malobeo.initssh
+      inputs.malobeo.nixosModules.malobeo.disko
+
       ../modules/sshd.nix
       ../modules/minimal_tools.nix
-      inputs.self.nixosModules.malobeo.initssh
-      inputs.self.nixosModules.malobeo.disko
     ];
 
   malobeo.users = {
diff --git a/machines/uptimekuma/configuration.nix b/machines/uptimekuma/configuration.nix
index 59c97e3..748fd62 100644
--- a/machines/uptimekuma/configuration.nix
+++ b/machines/uptimekuma/configuration.nix
@@ -9,7 +9,8 @@ with lib;
   };
 
   imports = [
-    self.nixosModules.malobeo.users
+    inputs.malobeo.nixosModules.malobeo.users
+
     ../modules/sshd.nix
   ];
 
diff --git a/machines/vaultwarden/configuration.nix b/machines/vaultwarden/configuration.nix
index 7d2c0fc..2c42459 100644
--- a/machines/vaultwarden/configuration.nix
+++ b/machines/vaultwarden/configuration.nix
@@ -16,9 +16,10 @@ with lib;
   };
 
   imports = [
-    self.nixosModules.malobeo.users
+    inputs.malobeo.nixosModules.malobeo.users
+    inputs.malobeo.nixosModules.malobeo.metrics
+
     ../modules/sshd.nix
-    inputs.self.nixosModules.malobeo.metrics
   ];
 
   malobeo.users = {
diff --git a/machines/vpn/configuration.nix b/machines/vpn/configuration.nix
index 42c65f9..911e9fa 100644
--- a/machines/vpn/configuration.nix
+++ b/machines/vpn/configuration.nix
@@ -17,8 +17,9 @@ with lib;
   };
 
   imports = [
-    inputs.self.nixosModules.malobeo.vpn
-    self.nixosModules.malobeo.users
+    inputs.malobeo.nixosModules.malobeo.vpn
+    inputs.malobeo.nixosModules.malobeo.users
+
     ../modules/sshd.nix
     ../modules/minimal_tools.nix
   ];
diff --git a/machines/wordpress/configuration.nix b/machines/wordpress/configuration.nix
index 67b5394..c28a89c 100644
--- a/machines/wordpress/configuration.nix
+++ b/machines/wordpress/configuration.nix
@@ -23,7 +23,8 @@ in {
   };
 
   imports = [
-    inputs.self.nixosModules.malobeo.users
+    inputs.malobeo.nixosModules.malobeo.users
+
     ../modules/sshd.nix
   ];
 
diff --git a/machines/zineshop/configuration.nix b/machines/zineshop/configuration.nix
index 5101e3b..8e0189b 100644
--- a/machines/zineshop/configuration.nix
+++ b/machines/zineshop/configuration.nix
@@ -1,4 +1,4 @@
-{ self, config, lib, pkgs, inputs, ... }:
+{ config, lib, pkgs, inputs, ... }:
 
 with lib;
 
@@ -11,8 +11,9 @@ with lib;
   imports = [
     inputs.malobeo.nixosModules.malobeo.metrics
     inputs.malobeo.nixosModules.malobeo.printing
+    inputs.malobeo.nixosModules.malobeo.users
     inputs.zineshop.nixosModules.zineshop
-    self.nixosModules.malobeo.users
+
     ../modules/sshd.nix
   ];