Ooh, I like the bottle of water idea better than the glass of water idea (things won't be dropping into the water in the middle of the night, and it won't accidentally get spilled), but I still don't mind getting up to get a drink.

As far as your work desk goes, it would help if the accumulation of actual work didn't get so out of hand as it does!