diff --git a/modules/environment/login/login-inner.nix b/modules/environment/login/login-inner.nix
index 1542fdf..8dbe591 100644
--- a/modules/environment/login/login-inner.nix
+++ b/modules/environment/login/login-inner.nix
@@ -5,7 +5,7 @@
 let
   inherit (initialPackageInfo) cacert nix;
 
-  nixCmd = "${nix}/bin/nix --extra-experimental-features flakes --extra-experimental-features nix-command";
+  nixCmd = "${nix}/bin/nix --extra-experimental-features 'flakes nix-command'";
 in
 
 writeText "login-inner" ''
diff --git a/nix-on-droid/nix-on-droid.sh b/nix-on-droid/nix-on-droid.sh
index 6fa28ab..e63c660 100644
--- a/nix-on-droid/nix-on-droid.sh
+++ b/nix-on-droid/nix-on-droid.sh
@@ -1,6 +1,6 @@
 #!@bash@/bin/bash
 
-# Copyright (c) 2019-2021, see AUTHORS. Licensed under MIT License, see LICENSE.
+# Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE.
 
 PATH=@coreutils@/bin:@nix@/bin:${PATH:+:}$PATH
 
@@ -136,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 nix-command")
             # add "nixOnDroidConfigurations." as prefix in attribute name, e.g.
             # /path/to/flake#device -> /path/to/flake#nixOnDroidConfigurations.device
             FLAKE_CONFIG_URI="${1%#*}#nixOnDroidConfigurations.${1#*#}"