diff --git a/modules/environment/login/login-inner.nix b/modules/environment/login/login-inner.nix
index 2440a73..68b651a 100644
--- a/modules/environment/login/login-inner.nix
+++ b/modules/environment/login/login-inner.nix
@@ -44,7 +44,8 @@ writeText "login-inner" ''
       ${coreutils}/bin/chmod u+w $HOME/.config/nixpkgs/nix-on-droid.nix
 
       echo "Installing first nix-on-droid generation..."
-      ${nix}/bin/nix build --no-link --file "<nix-on-droid>" nix-on-droid
+      ${nix}/bin/nix build --extra-experimental-features nix-command \
+        --no-link --file "<nix-on-droid>" nix-on-droid
       $(${nix}/bin/nix path-info --file "<nix-on-droid>" nix-on-droid)/bin/nix-on-droid switch
 
       echo
diff --git a/modules/environment/login/login.nix b/modules/environment/login/login.nix
index 4a86865..4a321ba 100644
--- a/modules/environment/login/login.nix
+++ b/modules/environment/login/login.nix
@@ -31,7 +31,7 @@ writeScript "login" ''
     fi
   fi
 
-  if [ ! -r /proc/stat ] && [ -e ${fakeProcStat} ]; then
+  if [ ! -r /proc/stat ] && [ -e ${installationDir}${fakeProcStat} ]; then
     BIND_PROC_STAT="-b ${installationDir}${fakeProcStat}:/proc/stat"
   else
     BIND_PROC_STAT=""
diff --git a/nix-on-droid/nix-on-droid.sh b/nix-on-droid/nix-on-droid.sh
index d1969e9..de1b3d9 100644
--- a/nix-on-droid/nix-on-droid.sh
+++ b/nix-on-droid/nix-on-droid.sh
@@ -25,7 +25,9 @@ function setupPasstroughOpts() {
 
 function nixActivationPackage() {
     local command="$1"
-    local extraArgs=("${@:2}" "${PASSTHROUGH_OPTS[@]}")
+    local extraArgs=("${@:2}"
+                     --extra-experimental-features nix-command
+                     "${PASSTHROUGH_OPTS[@]}")
     local nix=nix
     if [[ -n "${FLAKE_CONFIG_URI}" ]]; then
         nix=@nix24@/bin/nix
@@ -134,7 +136,7 @@ while [[ $# -gt 0 ]]; do
             shift
             ;;
         -F|--flake)
-            PASSTHROUGH_OPTS+=(--extra-experimental-features flakes --extra-experimental-features nix-command)
+            PASSTHROUGH_OPTS+=(--extra-experimental-features flakes)
             # add "nixOnDroidConfigurations." as prefix in attribute name, e.g.
             # /path/to/flake#device -> /path/to/flake#nixOnDroidConfigurations.device
             FLAKE_CONFIG_URI="${1%#*}#nixOnDroidConfigurations.${1#*#}"