diff --git a/.beads/.gitignore b/.beads/.gitignore
index 4a7a77d..d27a1db 100644
--- a/.beads/.gitignore
+++ b/.beads/.gitignore
@@ -32,6 +32,11 @@ beads.left.meta.json
 beads.right.jsonl
 beads.right.meta.json
 
+# Sync state (local-only, per-machine)
+# These files are machine-specific and should not be shared across clones
+.sync.lock
+sync_base.jsonl
+
 # NOTE: Do NOT add negation patterns (e.g., !issues.jsonl) here.
 # They would override fork protection in .git/info/exclude, allowing
 # contributors to accidentally commit upstream issue databases.
diff --git a/pkgs/default.nix b/pkgs/default.nix
index f92e6b9..85460a1 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -2,17 +2,7 @@
   pkgs,
   inputs ? null,
   ...
-}: let
-  # Upstream opencode v1.1.27 strictly requires Bun 1.3.5 but its locked nixpkgs provides 1.3.6
-  # We patch package.json to match the environment version to fix the build
-  opencode = inputs.opencode.packages.${pkgs.system}.opencode.overrideAttrs (old: {
-    postPatch =
-      (old.postPatch or "")
-      + ''
-        substituteInPlace package.json --replace-fail "bun@1.3.5" "bun@1.3.6"
-      '';
-  });
-in {
+}: {
   # Custom packages registry
   # Each package is defined in its own directory under pkgs/
   beads = pkgs.callPackage ./beads {};
@@ -29,6 +19,6 @@ in {
   zellij-ps = pkgs.callPackage ./zellij-ps {};
 
   # Imported from flake inputs
-  inherit opencode;
-  opencode-desktop = inputs.opencode.packages.${pkgs.system}.desktop.override {inherit opencode;};
+  opencode = inputs.opencode.packages.${pkgs.system}.opencode;
+  opencode-desktop = inputs.opencode.packages.${pkgs.system}.desktop;
 }