An important reasoning task, in addition to the standard DL reasoning services, is conjunctive query answering. In this paper, we present a decision procedure for conjunctive query entailment in the expressive Description Logic SHOQ. This is, to the best of our knowledge, the first decision procedure for conjunctive query entailment in a logic that allows for nominals. We achieve this by combining the techniques used in the conjunctive query entailment procedure for SHIQ with the techniques proposed for a restricted class of conjunctive queries in SHOQ.