...make it a link, you lazy-ass bastard, you![*]
Yup, that's the one, no doubt about it. I'd already forgotten that Stephen Fry was in it (or if I just missed him; I didn't get to see quite all of it) -- but Christopher Lee as his Lordship's secretary was damn inspired casting, wasn't it?
[*]: Naah, no need to start a falme-war; the other one did the trick, already.