diff --git a/machines/sue/configuration.nix b/machines/sue/configuration.nix
index 6b553cf..353910b 100644
--- a/machines/sue/configuration.nix
+++ b/machines/sue/configuration.nix
@@ -48,6 +48,7 @@ in {
     facter.reportPath = ./facter.json;
     home-manager.users.pim.imports = [./home.nix];
     networking.hostName = "sue";
+    nix.settings.trusted-users = ["pim"];
 
     sops = {
       age.keyFile = "/root/.config/sops/age/keys.txt";
diff --git a/nixos/default.nix b/nixos/default.nix
index e74bb98..111a096 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -89,8 +89,6 @@
 
     nix = {
       package = pkgs.nixFlakes;
-      # TODO: "pim" shouldn't be here by default
-      settings.trusted-users = ["root" "pim"];
 
       extraOptions = ''
         experimental-features = nix-command flakes
@@ -145,9 +143,7 @@
       useGlobalPkgs = true;
       useUserPackages = true;
       extraSpecialArgs = {inherit self inputs;};
-
-      # TODO: shouldn't be here by default
-      users.pim.imports = ["${self}/home-manager"];
+      sharedModules = ["${self}/home-manager"];
     };
   };
 }