REBASEME: Ensure a bucket always maps to same lock

Again, this deadlocks. No idea why yet.