diff --git a/citrus.nix b/citrus.nix
index 6e597b6..a179b6d 100644
--- a/citrus.nix
+++ b/citrus.nix
@@ -22,6 +22,10 @@
     displayManager.autoLogin.user = "appuser";
     windowManager.fluxbox.enable = true;
   };
+
+  environment.systemPackages = with pkgs; [
+    git btop tmux ffmpeg-headless
+  ];
   
   users = {
     # No need to edit users on a single-purpose system.
diff --git a/flake.nix b/flake.nix
index 20be772..ee112be 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,6 +26,7 @@
         ./citrus.nix
         "${nixpkgs}/nixos/modules/virtualisation/qemu-vm.nix"
         ./platforms/riversong.nix
+        { nix.registry.nixpkgs.flake = inputs.nixpkgs; }
       ];
     };
     in rec {
@@ -52,6 +53,7 @@
         "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
         ./platforms/melodypond.nix
         inputs.nixos-hardware.nixosModules.raspberry-pi-4
+        { nix.registry.nixpkgs.flake = inputs.nixpkgs; }
       ];
     in {
       # Colmena deploy manifest