Refactored object locking code.
More lock refactoring. Yay.