diff --git a/flake-modules/overlays.nix b/flake-modules/overlays.nix
index ae9b7cd..b1eddab 100644
--- a/flake-modules/overlays.nix
+++ b/flake-modules/overlays.nix
@@ -1,23 +1,10 @@
 { inputs, ... }:
 {
   # Add unstable packages to overlay
-  flake.overlays.unstable =
-    final: prev:
-    let
-      unstablePkgs = inputs.unstable.legacyPackages.${prev.stdenv.hostPlatform.system};
-    in
-    {
-      # Get unstable packages
-      unstable = unstablePkgs;
-
-      # Update vim plugins with the versions from unstable
-      vimPlugins = prev.vimPlugins // unstablePkgs.vimPlugins;
-
-      # Get specific packages from unstable
-      inherit (unstablePkgs)
-        gitoxide
-        jujutsu
-        ;
-    };
+  flake.overlays.unstable = final: prev: {
+    unstable = inputs.unstable.legacyPackages.${prev.stdenv.hostPlatform.system};
 
+    # use unstable vimPlugins
+    vimPlugins = prev.vimPlugins // final.unstable.vimPlugins;
+  };
 }
diff --git a/home/default.nix b/home/default.nix
index f2b8ea1..851e89c 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -118,7 +118,7 @@ in
         packages = [
           pkgs.gopass
           pkgs.sshfs
-          pkgs.gitoxide
+          pkgs.unstable.gitoxide
         ];
         # Extra variables
         sessionVariables = {
@@ -196,6 +196,7 @@ in
         # Jujutsu (alternative DVCS (git-compatible))
         jujutsu = {
           enable = true;
+          package = pkgs.unstable.jujutsu;
           settings = {
             ui.pager = "bat";
             # mimic git commit --verbose by adding a diff
diff --git a/nvim/standalone.nix b/nvim/standalone.nix
index 8e25d9e..1d48cba 100644
--- a/nvim/standalone.nix
+++ b/nvim/standalone.nix
@@ -10,6 +10,7 @@
 
   config = {
     withRuby = false;
+    nixpkgs.useGlobalPackages = true;
     globals.mapleader = " ";
     # Appearance
     colorschemes.gruvbox = {