Go back to using flat files for locking but keep them in the repo-specific GIT_DIR.