* fix: don't use skip locked

* fix: generate external id earlier and use it as the claimant

* fix: add a regression test

* fix: modify PK