What fixed it for me was a 1L bottle on the desk. If it's in reach I drink it, if it's in the kitchen I don't. Never was a willpower problem, it was a distance problem.