diff --git a/machines/nix-on-droid/aarch64-linux/cheetah/configuration.nix b/machines/nix-on-droid/aarch64-linux/cheetah/configuration.nix
index c1df18b..d94f951 100644
--- a/machines/nix-on-droid/aarch64-linux/cheetah/configuration.nix
+++ b/machines/nix-on-droid/aarch64-linux/cheetah/configuration.nix
@@ -23,6 +23,8 @@
     keep-derivations = true
   '';
 
+  nix.package = pkgs.nixUnstable;
+
   time.timeZone = "Europe/Sofia";
 
   terminal.font =
@@ -30,7 +32,7 @@
       firacode = pkgs.nerdfonts.override {
         fonts = [ "FiraCode" ];
       };
-      fontPath = "share/fonts/truetype/NerdFonts/Fira Code Regular Nerd Font Complete Mono.ttf";
+      fontPath = "share/fonts/truetype/NerdFonts/FiraCodeNerdFontMono-Regular.ttf";
     in
     "${firacode}/${fontPath}";
 }
diff --git a/util/default.nix b/util/default.nix
index df70e60..0cc0bcc 100644
--- a/util/default.nix
+++ b/util/default.nix
@@ -136,7 +136,7 @@ rec {
     pkgs = import nixpkgs {
       inherit system;
 
-      overlays = [
+      overlays = builtins.attrValues outputs.overlays ++ [
         inputs.nix-on-droid.overlays.default
       ];
     };