diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..7dbb2a9
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,66 @@
+{
+  "nodes": {
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1633596850,
+        "narHash": "sha256-5+qVLYvfOropjLAvpQs/APtD8eYnEIbAd9a36lGHZM0=",
+        "owner": "rycee",
+        "repo": "home-manager",
+        "rev": "49695f33aac22358b59e49c94fe6472218e5d766",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rycee",
+        "ref": "release-21.05",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "nixos-unstable": {
+      "locked": {
+        "lastModified": 1633971123,
+        "narHash": "sha256-WmI4NbH1IPGFWVkuBkKoYgOnxgwSfWDgdZplJlQ93vA=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "e4ef597edfd8a0ba5f12362932fc9b1dd01a0aef",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1634115022,
+        "narHash": "sha256-K9DZMQ47VRrg9gtTPwex5p0E8LnwM/dDkNe7AQW0qj0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "564cb4d81d4f734dd068684adec5a60077397fe9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-21.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "home-manager": "home-manager",
+        "nixos-unstable": "nixos-unstable",
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
index fe8c943..5eda88f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,7 +28,7 @@
     inherit (utils) user;
   in  {
     nixosConfigurations = {
-      architect = host.mkHost { name = "architect"; users = [ { user = "giulio"; } ]; };
+      architect = host.mkHost { name = "architect"; users = [ { user = "giulio"; roles = []; } ]; };
       gAluminum = host.mkHost { name = "gAluminum"; users = [ { user = "giulio"; roles = [ "desktop" "ssh" "git" ]; } ]; roles = [ "gnome" ]; };
       proxy = host.mkHost { name = "proxy"; };
     };
diff --git a/hosts/architect/default.nix b/hosts/architect/default.nix
index 866c6ec..4000ff3 100644
--- a/hosts/architect/default.nix
+++ b/hosts/architect/default.nix
@@ -10,8 +10,6 @@ in
       [ # Include the results of the hardware scan.
       ./backup.nix
       ./hardware.nix
-      ../../common.nix
-      ../../users.nix
       ./firewall.nix
       ./nginx.nix
       ./gitea.nix
diff --git a/lib/host.nix b/lib/host.nix
index d52facf..e7579d5 100644
--- a/lib/host.nix
+++ b/lib/host.nix
@@ -7,7 +7,7 @@
 
     mkRole = role : import (../roles + "/${role}.nix");
 
-    users_mod= (map (u: user.mkUser {name = u.user; roles= u.roles; }) users);
+    users_mod= (map (u: user.mkUser {name = u.user; roles = u.roles; }) users);
     roles_mod = (map (r: mkRole r) roles);
   in nixpkgs.lib.nixosSystem {
     inherit system;