DNM: objecter locking refactor

Just to capture review comments.