I just bought the best coffee mug ever. It fits in the waters bottle holders great and holds 18oz and looks pretty sharp..
It marketed by Trek and come with the Soho 3.0 bike or you can get it direct from Trek.