Revert "point Cartridge.lock somewhere else"

This reverts commit 09262c3f334118b7aece752704c6c8929ea4145b.