fix: fb: rework locking to fix lock ordering on takeover