diff --git a/.envrc b/.envrc
index db1b4df9..cfbd5798 100644
--- a/.envrc
+++ b/.envrc
@@ -8,4 +8,4 @@ if [[ -e trusted/trusted/flake.nix ]]; then
 	export TRUSTED=1
 fi
 
-use nix
+use flake
diff --git a/devShell.nix b/devShell.nix
index b3b99624..b130acb0 100644
--- a/devShell.nix
+++ b/devShell.nix
@@ -7,16 +7,14 @@ let
   inherit (lib.options) optional;
   inherit (lib.attrsets) attrValues;
   nf-actions = pkgs.writeShellScriptBin "nf-actions" ''
-    cd "${toString ./.}"
-    NF_CONFIG_FILES=($NF_CONFIG_ROOT/{nodes,flake-cron}.nix)
+    NF_CONFIG_FILES=($NF_CONFIG_ROOT/ci/{nodes,flake-cron}.nix)
     for f in "''${NF_CONFIG_FILES[@]}"; do
       echo $f
       nix run --argstr config "$f" -f '${inputs.ci}' run.gh-actions-generate
     done
   '';
   nf-actions-test = pkgs.writeShellScriptBin "nf-actions-test" ''
-    cd "${toString ./.}"
-    nix run --argstr config "$NF_CONFIG_ROOT/nodes.nix" -f '${inputs.ci}' job.tewi.test
+    nix run --argstr config "$NF_CONFIG_ROOT/ci/nodes.nix" -f '${inputs.ci}' job.tewi.test
   '';
   nf-update = pkgs.writeShellScriptBin "nf-update" ''
     nix flake update