diff --git a/modules/mullvad/default.nix b/modules/mullvad/default.nix
index 73174e3..dc9e461 100644
--- a/modules/mullvad/default.nix
+++ b/modules/mullvad/default.nix
@@ -53,20 +53,10 @@ in
           (name: lib.nameValuePair "wireguard/${name}" { source = "${relayConfigFiles}/${name}"; })
           (lib.attrNames relayConfigs));
 
-      systemPackages = lib.singleton (pkgs.stdenv.mkDerivation {
-        name = "mullvad-on-demand";
-
-        src = ./mullvad.sh;
-
-        dontUnpack = true;
-        dontBuild = true;
-
-        installPhase = ''
-          runHook preInstall
-          install -D $src $out/bin/mullvad
-          runHook postInstall
-        '';
-      });
+      systemPackages = lib.singleton (pkgs.runCommandNoCC "mullvad-on-demand" { } ''
+        install -D ${./mullvad.sh} $out/bin/mullvad
+        install -D ${./mullvad-fzf.sh} $out/bin/mullvad-fzf
+      '');
     };
   };
 }
diff --git a/modules/mullvad/mullvad-fzf.sh b/modules/mullvad/mullvad-fzf.sh
new file mode 100755
index 0000000..7f05948
--- /dev/null
+++ b/modules/mullvad/mullvad-fzf.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+mullvad $(find /etc/wireguard -name "mlv-*.conf" -printf "%f\n" | sed 's/mlv-\(.*\)\.conf/\1/' | fzf)