chore: Leverage new Lock types

[jamescrosswell]

Resolves #3689

• Leverage new Lock types #3689

#skip-changelog

[github-actions]

Semver Impact of This PR

⚪ None (no version bump detected)

📋 Changelog Preview

This is how your changes will appear in the changelog.
Entries from this PR are highlighted with a left border (blockquote style).

---

This PR will not appear in the changelog.

---

_{🤖 This preview updates automatically when you update the PR.}

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 73.93%. Comparing base (e7c25cc) to head (2163dd1).
⚠️ Report is 20 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #4983      +/-   ##
==========================================
+ Coverage   73.87%   73.93%   +0.06%     
==========================================
  Files         496      497       +1     
  Lines       17951    17974      +23     
  Branches     3516     3517       +1     
==========================================
+ Hits        13261    13289      +28     
+ Misses       3832     3826       -6     
- Partials      858      859       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.