It's taken nearly three years, but I finally got round to buy a water bottle for work!
It only has a slight flaw, in that in order to get at the last mouthful you have to take the lid off!