diff --git a/nix/lib.nix b/nix/lib.nix
index 90554403..818eb680 100644
--- a/nix/lib.nix
+++ b/nix/lib.nix
@@ -81,7 +81,13 @@ let
               system-manager = pkgs.callPackage ./packages/wrapper.nix {
                 system-manager-unwrapped = pkgs.callPackage ../package.nix { };
               };
-              userborn = userborn.packages.${config.nixpkgs.hostPlatform}.default;
+              userborn =
+                userborn.packages.${
+                  if config.nixpkgs.hostPlatform ? system then
+                    config.nixpkgs.hostPlatform.system
+                  else
+                    config.nixpkgs.hostPlatform
+                }.default;
             };
           };
 
diff --git a/nix/modules/default.nix b/nix/modules/default.nix
index 76147858..6a99346b 100644
--- a/nix/modules/default.nix
+++ b/nix/modules/default.nix
@@ -265,7 +265,9 @@
         '';
 
         deactivationScript = pkgs.writeShellScript "deactivate" ''
-          export PATH="$PATH:${lib.makeBinPath [ config.services.userborn.package ]}"
+          export PATH="$PATH:${
+            lib.makeBinPath (lib.optionals config.services.userborn.enable [ config.services.userborn.package ])
+          }"
           ${system-manager}/bin/system-manager-engine deactivate "$@"
         '';