diff --git a/flake.nix b/flake.nix
index 9e7a493..458204e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,7 @@
     onixpkgs.url = "nixpkgs/nixos-24.11";
     nixpkgs.url = "nixpkgs/nixos-25.05";
     unixpkgs.url = "nixpkgs/nixos-unstable";
-    zelbarnixpkgs.url = "github:GeoffreyFrogeye/nixpkgs/zelbar";
+    zelbarnixpkgs.url = "github:wlcx/nixpkgs/zelbar";
     # OS
     disko = {
       url = "disko";
@@ -60,15 +60,15 @@
           (import ./common/update-local-flakes/overlay.nix)
           nur.overlays.default
           (
-            # Cherry-pick packages from future
+            # Cherry-pick packages from other places
             self: super:
             let
               upkgs = import unixpkgs { inherit (super) system; };
-              zelbarpkgs = import zelbarnixpkgs { inherit (super) system; };
             in
             {
-              hello = upkgs.hello; # Placeholder
-              zelbar = zelbarpkgs.zelbar;
+              # hello = upkgs.hello; # Take package and dependencies: heavier
+              # hello = super.callPackage "${unixpkgs}/pkgs/by-name/he/hello/package.nix" { }; # Take package only: not always possible
+              zelbar = super.callPackage "${zelbarnixpkgs}/pkgs/by-name/ze/zelbar/package.nix" { };
               fluffychat = upkgs.fluffychat; # unstable so we have 2.0 which doesn't have security warnings
             }
           )
@@ -87,6 +87,7 @@
           nixpkgs.lib.nixosSystem {
             inherit system;
             specialArgs = attrs // {
+              # Cherry-pick packages from other places without overlays.
               upkgs = import unixpkgs {
                 inherit system;
               };
diff --git a/hm/desktop/frobar/default.nix b/hm/desktop/frobar/default.nix
index a0746a8..5110be4 100644
--- a/hm/desktop/frobar/default.nix
+++ b/hm/desktop/frobar/default.nix
@@ -1,17 +1,11 @@
 {
-  zelbarnixpkgs ? builtins.getFlake "github:GeoffreyFrogeye/nixpkgs/zelbar",
+  zelbarnixpkgs ? builtins.getFlake "github:wlcx/nixpkgs/zelbar",
   nixpkgs ? <nixpkgs>,
   pkgs ? import nixpkgs {
     overlays = [
-      (
-        self: super:
-        let
-          zelbarpkgs = import zelbarnixpkgs { inherit (super) system; };
-        in
-        {
-          inherit (zelbarpkgs) zelbar;
-        }
-      )
+      (self: super: {
+        zelbar = super.callPackage "${zelbarnixpkgs}/pkgs/by-name/ze/zelbar/package.nix" { };
+      })
     ];
   },
   ...