Device separation is the only control that survives contact with reality, and the failure is always the same: one quick thing on the wrong laptop because the other one was in another room.
Two physical habits that made it stick for me: the machines never sit on the desk at the same time, and they use different keyboard layouts, so the wrong one feels wrong within a word or two. Sounds silly, and it has caught me several times.