timekeeping: Move lock out of timekeeper struct