diff --git a/machines/fanny/configuration.nix b/machines/fanny/configuration.nix
index 4e60aae..1d16e76 100644
--- a/machines/fanny/configuration.nix
+++ b/machines/fanny/configuration.nix
@@ -13,6 +13,7 @@ in
       ../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
diff --git a/machines/infradocs/configuration.nix b/machines/infradocs/configuration.nix
index fece076..d1cc2fa 100644
--- a/machines/infradocs/configuration.nix
+++ b/machines/infradocs/configuration.nix
@@ -9,7 +9,7 @@ with lib;
   };
 
   imports = [
-    self.nixosModules.malobeo.metrics
+    inputs.malobeo.nixosModules.malobeo.metrics
     ../durruti/documentation.nix
     ../modules/malobeo_user.nix
     ../modules/sshd.nix
diff --git a/machines/lucia/configuration.nix b/machines/lucia/configuration.nix
index 7184763..3688f84 100644
--- a/machines/lucia/configuration.nix
+++ b/machines/lucia/configuration.nix
@@ -6,6 +6,7 @@ in
 {
   imports =
     [ # Include the results of the hardware scan.
+      ./hardware_configuration.nix
       ../modules/malobeo_user.nix
     ];
 
diff --git a/machines/vpn/configuration.nix b/machines/vpn/configuration.nix
index 82914b4..6caeed1 100644
--- a/machines/vpn/configuration.nix
+++ b/machines/vpn/configuration.nix
@@ -17,6 +17,7 @@ with lib;
   };
 
   imports = [
+    inputs.self.nixosModules.malobeo.vpn
     ../modules/malobeo_user.nix
     ../modules/sshd.nix
     ../modules/minimal_tools.nix