diff --git a/machines/base.nix b/machines/base.nix
index bf2be2d..61c5bbb 100644
--- a/machines/base.nix
+++ b/machines/base.nix
@@ -2,6 +2,11 @@
 
 {
 
+  imports = [
+    ../users/default.nix
+    ../users/julien.nix
+  ];
+
   luj.nix.enable = true;
   #luj.secrets.enable = true;
   luj.ssh-server.enable = true;
@@ -17,7 +22,6 @@
     keyMap = lib.mkForce "fr";
   };
 
-
   programs.gnupg.agent.enable = true;
 
   networking.firewall.enable = true;
@@ -68,5 +72,4 @@ VfXtULncAiEA2gmqdr+ugFz5tvPdKwanroTiMTUMhhCRYVlQlyTApyQ=
   ];
 
 
-
 }
diff --git a/machines/core-data/default.nix b/machines/core-data/default.nix
index 8202365..9a35b9f 100644
--- a/machines/core-data/default.nix
+++ b/machines/core-data/default.nix
@@ -4,8 +4,6 @@
   imports =
     [
       ./hardware.nix
-      ../../users/default.nix
-      ../../users/julien.nix
       ./home-julien.nix
     ];
 
diff --git a/machines/core-security/default.nix b/machines/core-security/default.nix
index 3476571..b48173a 100644
--- a/machines/core-security/default.nix
+++ b/machines/core-security/default.nix
@@ -4,8 +4,6 @@
   imports =
     [
       ./hardware.nix
-      ../../users/default.nix
-      ../../users/julien.nix
       ./home-julien.nix
     ];
 
diff --git a/machines/enigma/default.nix b/machines/enigma/default.nix
index e990450..6200e77 100644
--- a/machines/enigma/default.nix
+++ b/machines/enigma/default.nix
@@ -5,8 +5,6 @@
     [
       ./hardware.nix
       ./home-julien.nix
-      ../../users/julien.nix
-      ../../users/default.nix
     ];
 
   networking.hostName = "enigma";
diff --git a/machines/fischer/default.nix b/machines/fischer/default.nix
index da04311..21105b9 100644
--- a/machines/fischer/default.nix
+++ b/machines/fischer/default.nix
@@ -3,8 +3,6 @@
   imports = [
     ./hardware.nix
     ./home-julien.nix
-    ../../users/julien.nix
-    ../../users/default.nix
   ];
 
   # Boot stuff
diff --git a/machines/lambda/default.nix b/machines/lambda/default.nix
index 2165baf..563eb7a 100644
--- a/machines/lambda/default.nix
+++ b/machines/lambda/default.nix
@@ -5,8 +5,6 @@
     [
       ./hardware.nix
       ./home-julien.nix
-      ../../users/julien.nix
-      ../../users/default.nix
     ];
 
   boot.loader.systemd-boot.enable = true;
diff --git a/machines/lisa/default.nix b/machines/lisa/default.nix
index 42a48b9..b5b775a 100644
--- a/machines/lisa/default.nix
+++ b/machines/lisa/default.nix
@@ -5,8 +5,6 @@
       (modulesPath + "/profiles/qemu-guest.nix")
       ./hardware.nix
       ./home-julien.nix
-      ../../users/julien.nix
-      ../../users/default.nix
     ];
 
 
diff --git a/machines/tower/default.nix b/machines/tower/default.nix
index fceba5a..dcaeec8 100644
--- a/machines/tower/default.nix
+++ b/machines/tower/default.nix
@@ -3,11 +3,8 @@
 {
   imports =
     [
-      # Include the results of the hardware scan.
       ./hardware.nix
       ./home-julien.nix
-      ../../users/julien.nix
-      ../../users/default.nix
     ];
 
   # Bootloader.
diff --git a/machines/x2100/default.nix b/machines/x2100/default.nix
index d852c87..49cb874 100644
--- a/machines/x2100/default.nix
+++ b/machines/x2100/default.nix
@@ -5,8 +5,6 @@
     [
       ./hardware.nix
       ./home-julien.nix
-      ../../users/julien.nix
-      ../../users/default.nix
       ../../share.nix
     ];
 
@@ -99,26 +97,26 @@
   ];
 
 
-  networking.wireguard.interfaces.rezo = {           
-  ips = [ "fd81:fb3a:50cc::200/128" ];
+  networking.wireguard.interfaces.rezo = {
+    ips = [ "fd81:fb3a:50cc::200/128" ];
     privateKeyFile = "/root/wg-private";
-     peers = [
-       {
-         publicKey = "srQPT9ZjXBKyJ7R1mvXYMZNy+NcnHMy5qE1WGZDfmnc=";
-         allowedIPs = [ "fd81:fb3a:50cc::/48" ];
-         endpoint = "129.199.146.230:25351";
-       }
-     ];                                                                                                          
-   };
+    peers = [
+      {
+        publicKey = "srQPT9ZjXBKyJ7R1mvXYMZNy+NcnHMy5qE1WGZDfmnc=";
+        allowedIPs = [ "fd81:fb3a:50cc::/48" ];
+        endpoint = "129.199.146.230:25351";
+      }
+    ];
+  };
+
 
-  
 
   services.hash-collection = {
     enable = true;
     retries = 1;
     collection-url = "http://localhost:8000";
     tokenFile = "/home/julien/token";
-  }; 
+  };
 
   services.printing.enable = true;
   services.avahi.enable = true;