diff --git a/justfile b/justfile
index 442513e..ea8f58f 100644
--- a/justfile
+++ b/justfile
@@ -5,20 +5,20 @@ check:
     nix flake check
 
 switch *args:
-    bash switch.sh {{args}}
+    bash switch.sh {{ justfile_directory() }} {{args}}
 
 rollback:
     sudo nixos-rebuild switch --rollback
 
 boot *args:
-    sudo nixos-rebuild boot --flake . --keep-going {{args}}
+    sudo nixos-rebuild boot --flake {{ justfile_directory() }} --keep-going {{args}}
 
 deploy system user="leo":
     #!/usr/bin/env bash
     set -euo pipefail
     flake=$(nix eval --impure --raw --expr "(builtins.getFlake \"git+file://$PWD\").outPath")
     nix copy "$flake" --to "ssh://{{user}}@{{system}}"
-    ssh -t "{{user}}@{{system}}" "bash $flake/switch.sh"
+    ssh -t "{{user}}@{{system}}" "bash $flake/switch.sh $flake"
 
 lint *args:
     statix check -i flake.nix **/hardware-configuration.nix {{args}}
diff --git a/switch.sh b/switch.sh
index 1496a57..d941066 100644
--- a/switch.sh
+++ b/switch.sh
@@ -4,11 +4,10 @@ set -euo pipefail
 bold=$(tput bold)
 reset=$(tput sgr0)
 
-script_path=$(readlink -f "${BASH_SOURCE[0]}")
-flake=$(dirname "$script_path")
+flake="$1"
 
 echo "${bold}Building configuration...$reset"
-configuration=$(sudo nixos-rebuild dry-activate --flake "$flake" --keep-going "$@")
+configuration=$(sudo nixos-rebuild dry-activate --flake "$flake" --keep-going "${@:2}")
 echo "$configuration"
 
 nix run "$flake#nixosConfigurations.$(hostname).pkgs.nvd" -- diff /run/current-system "$configuration"