I'm pretty sure on this one but just checking... I can change a hit to a crit with ATC, then spend the lock... right? But if I spend the lock first, then I can't change a hit to crit any more.

Correct.